Password screen mostly fixed; script tweaks