Took a nap, woke up, made some changes. Here they are...
Fixed some taxi issues