Made things a bit more scriptable