script fixes and style updates