some edits, and making comments red