general improvements including better Queue handling thanks to Braden