slightly modified some values
added block enums