Working on some bugfixes

47 % Done