better scripts; fix #7