Added enums and testing statements, and fixed misc.