-- fixed errors