controller 2 fixes and cleaned up imports