Some more work with comments

Now to get them in the correct place..