Taxi now behaves correctly.
Storm bug fixed.