LOTS of error fixes.