* Fix TPS command output * Cleanup + rebase --------- Co-authored-by: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>