Fixing a bunch of errors

syncing up so I can pull working controllers