fully functional project

minor bugfixes