Removed CourseName enum, removed GSON, added JAXB annotations, misc methods