putting in some updates from a while back that I hadn't pushed