final commit with android changes, bendus modifications not here yet