cleaned up random comments and fixed more enum related errors