minor controller changes