renamed -r (added justify for p) + modified some option names