cleaned up some - comments, mostly