Inline scripts now all executed - other changes