Add comments, remove extra code

Removed some leftover commented code from debugging, added comments on a
few areas