Rewrote help and added -P