Fixed some Errors (not all)