Some few changes with the comments
Some formatting, comments and a bugfix that I managed to sneak in there while I was fixing
A little bit of tweaking here and there