rework commandline interface

Now works with these nice, modern commands that
everyone's so fond off (except for some UNIX beards, perhaps)