bugfixing, a lot of refactoring on TODO list