comments and other minor changes