Lots of fixes

CPPI fixes,
Text fixes