some more slight fixes to controller