Added options back (most don't work), some verbosity