testing and bugfixing new stuff