porting changes from web to android - more to come, likely.

Signed-off-by: William Rockwood <wrockwood@tadl.org>