fixes / optimizations for driving and other stuff