Changed some command line options
Sync devel files.