Fixed Klassemetoder
Added Timer
Minor improvements