More misc changes, shame shame. Last Update for a while, going to Tokyo.