some bugfixes version 1.0.5 [beta]