Minor improvements, also CPPI

Just minor stuff, don't hurry to merge