Subtle fixes and script generation in progress