helm-swoop and some other changes