a few comments, some cleaning up