Misc comments and a VERY minor bugette