Fixed a krapton of errors