pu11 script improvements
Merge https://github.com/mbsdev/MBS-Now