A lot of fixes, tweaks to scripts.