fixed most of the error
fixed