Couple updates to SimpleScript