more cleanup and some comments, time to ZZzzz now