fixed some new errors