add toyota, minor style fixes