fixing last bugs, soon ready for cleanup and some user testing