fix some errors - but these are still wrong