quickfix

To prevent an errormessage. Hovering is not working anyway...
part II of mayor refactor

Got rid of some of the global variables.