add version swith to CLI
refactoring of CLI code + more verbose output