Update and fix Errors