bugfixes and new advancements
