more comment fixes & minor tidy ups