Add changes made during Android talk. This involved NO code cleanup :)