Release prep

Please don't merge yet. There might be more.