Small fixes and new validation script.