Small tweaks and new script