fixes #107
fixes #103
added currentClass and hashmap for all classes as a start for #77 (finally :D)