more controller updtes
completed controller cleanup