Fixed errors, added verbosity