fixed some edge cases and improved the commenting#2

reubxn wants to merge 1 commit intomainFT-Autonomous/FT-Hardware:mainfrom

reuban-reviewFT-Autonomous/FT-Hardware:reuban-reviewCopy head branch name to clipboard