Cleanup and fix and trix. Adding some obj for android client aso.