More renaming elements
More renaming
Fix command line parsing (kind-of)
More output (for command line method)