added verbosity options, renamed some stuff