Minor bugfixes, IV now fits into CP.