Some tweakage (not final -- well... is it ever final??) for ctrlp