some more controller changes
some more changes and fixes