Fixed the command line utility so all options work.