Added -v<level> option and some minor driver cleanups