More commenting stuff
Merging changes