bugfixing, updates