Changes from Tryggvi

I have played around with this a bit and decided to just open a pull request for all of the changes if it so happens that you take a look before we talk (I'll just add all changes to this pull request).

I'm just doing random things since there are no issues to solve but that's probably for the best so you can focus on the important issues and I can just play around and clean stuff up for you to learn.