Fixed missing enumerate()
Rewrite of the command line interface