bugfixing complete, need to verify