bugfixing
performance changes