script-engine work.
- Minor fixes here and there