Working on some bugfixes

61 % Done