a few more little changes, still lots of errors