Continued Enum Fixes

Need to switch branches
Merge remote-tracking branch 'origin/Fixes/Improvements'

Conflicts:
	src/code/HeaderType.java

Fixed merge conflict in HeaderType.java