Update script general improvements