Improved scripts, compile to a jar now