ctrlP and some improvements