better fmp options
Even more consistent option names and style