Cat_RPU and minor fixes

Bock, Andy requested to merge Bock into master Oct 01, 2021