comment fixes & tidy ups