Semi-Final

Mostly adding comments and a few tweaks