Comment improvements

Bit of a rush job but should fix #3