A bit of refactoring.
Some more nice features.
Fixes for the use-... options