error governor fix
different minor style fixes