A little more configuration handling.
Exception handling.
Refactor options parsing.