Minor fixes
Integrates in some scriptloading tech