updates from I'm not sure when

I'm not sure about these, but they're probably ok.