More comments, starting to work on another version