Enhanced script loader
Fixed small typo
Small simplification