Fixed some Android 2.3 bugs, completed features