Scripting Updates

closes #44