updated: doc block comments and some cleanup