speed improvements
reorg
Removed scriptedplay dreg
3.7.4.x