more of Eric's small changes