Update helper scripts
Fix while to if optimization
Formatting and TODO
Limit output in interactive testing