added misc fixes
Fixed merge conflicts
Fixed rescue screen
Merge branch 'master' of https://github.com/segerphilip/sofdesfinal