misc updates
Merge branch 'master' of https://github.com/segerphilip/sofdesfinal
Nearly Finished Bug Hunt
Working on git issues