map update 3

Should hopefully fix everything.  Controllers added for remaining error shuttles.  *Crosses fingers* Requires testing.