updated TODO
cleanup: unnecessary methods
change style for existing highlighting
Merge branch 'master' into android-1.5