added ctrlp plus minor changes