Tweaked a few methods, nothing major.
Merge branch 'master' of github.com:aleksanb/fellesprosjektet