errata and suggestion, could merge and edit if you want