fixed some Errors, under progress