Fixed a few things, and switched enums in the db to use numeric values due to issues with Enum.ToString