Rejigger more
Update scripts and schedule