Create some helper scripts, and fix some issues