chg: change level if necessary
chg: clean up and editing