Finished converting to enums

Let me know if this is a destructive commit. Finding that I have to cast
all enums to ints is a hassle, though. Might have to change the
functions to accept the enums from the base BlockIds class though (might
help things)
Descriptive names for some functions