Small fixes, and added two (untested) scripts.