ok, doing pull request which gets this into decent...

# scripting

[apatrida]

ok, doing pull request which gets this into decent shape, will then move some things out via other pull requests, but nice to get it stable and working for others first.