More robust scripts
Add missing requirements
Assorted maintenance