Made the project ready for handin, removed debug lines and fixed some bugs