Some comments
Tried to make everything look a bit nicer
Merge remote-tracking branch 'robquistnl/master'