controller updates, cleanups