Added more comments
Fixed some comments
Removed unused enums