WIP
Cleanup and update some scripts