minor updates, mostly from Aaron