new errors, and new feature, and some fixes