Added ctrl-p module
Added some refinements