bugfixes and evolutions