A few changes, and better script interface generation