Various Commits

Individual commit comments contain detail regarding changes.

Compiled apk if interested for testing is available here: http://d-h.st/SF7