Comment cleanup

Including fixing some typos