Added/improved some errors.