Added ctrlp and some other small changes