fix a bug with comments

fix comments that are not indented to the same level as keywords
general cleanup