Add help for new commands in last commit and make error handling in main.c consistent and not an eyesore.