updated errors list and merged latest contributions made to accounts-entry