Improvements to WQ submit scripts