Minor tweaks, commented parts of the code