Tokentextarea: Fixing bugs found during verification on device and doing code refactoring for performance improvement.