Progress on error fixing