fixed few errors
fixed errors