sub comments fixed & and other little things
Just the break in the comments is removed
Merge remote-tracking branch 'origin/Mike' into Tony