Bugfixes from car debugging session

+ minor typo fixes