Prepping today's build

* Added some scripting with Kristian's code

* Small tweaks.