Bugfixes

fixing errors in assignment