More cleaning

More movings to Enums.cs.
Included "Removed bugs" from master.

See b9a8d4e44bcbd4e3507cd47a0ac64772724e066b.