A lot of errors are taken care of now