add some things, made controllers more portable, and other things