Fixed a few misc errors. Still not correct