clean up order and formatting, add a few new options