+++ amend some errors