small bug fixes
Merge branch 'develop' of github.com:villepetersson/DAT255-Grupp12 into develop