clean-up and comments

things seem to be running fairly well