more cleaning, comments, other stuff