add -p: 'q' should really quit