fixed some bugs (methods that were moved to new controller class needed
some more items from old controller class to work correctly)