Add more defaults, fix combining -s and -d options