A few fixes and new scripts.