comments, code clean up, review fixes