update the rest of the controllers

all broken up now