latest changes
fixed errors