more quick fixes, comments -- small things