Different enums and some bug fixes

The enums are set up to be more easily used in Visual Studio intellisense.