Clean up compile warnings
Reformat options declarations
Add command line options for new inc options