fixed some Errors