address notes, remove a lot of comment and debug junk