Small general updates, and revamped inter/1/cpp