Tidier G+ integration with some fixes