all scripts working, ready for merge into MASTER