Fix up the format of the rest of the options and work on some functions.