Script engine tweaks.
General imports cleanup