some name changes, comments and fixes