Added ctrlp, some tweaks.