Some GCM changes. Not working yet. A few visual tweaks.