Full error coverage on RX, some changes in common to use -1 for errors, rather than 1. Consistency is key.