Added ctrlp and other
Merged