Added an Enumeration for difficulty, cleaned up some warnings.