re-added ctrlp along with other minor changes