Some minor updates, print help, etc.