More updates, including adding gio.