Add help and usage and fixup CLI