small adjustments to some controllers and cleanup