Clean up

Zipaligned
Not sure tweaks deleted
re-work tweaks