removed logging, added comments, and other misc. changes