more changes

I don't know if you want to pull more changes into the current beta, but I'll push these out here for you in case you do, and if not you can leave them for the next one.