Minor Fixes and a new option.