Fixing CLI parsing

Separating standard arguments from wrapper arguments with --
Some python3 fixes.