Update recent changes

Not sure what all this update includes but I'm pushing it.