changes
fixed errors