a boat load of comments and some cleanu