Edit and Fix some Errors