removes needless define and removes warning
changes default -p value to 0.6