Clean up usage, TODO.

The usage for the `-bf` option was inconsistent, and it seems like you've accomplished your TODO items.