Committing some updates I made a while back