Various small changes.
Start scripting work.