misc controller changes