Fixing track in Obu form and improving controls