Finished testing and bugfixing