increased verbosity, corrected param handling