Allow -s to override values set in config file
Add some docs