Added defaults and extra comand line options