Some more work on the Android client, it is still broken though