Rename option --extend-by to --extendby
Add encoding to file options in click
Various minor clean ups