cleaned up some junk, added comments