update script to newest version, and merge stijns changes into it