Fixes

various script fixes