general housekeeping and a couple bugfixes with the human flag