Fix pid file check. Fixes #84.
Numerous CLI fixes. Closes #86.