More stringz
Add more consolidation
A few tweaks