Text scripts, and a few other additions
merged stuff
more mergeiness