Fix for HA Queues as well as logging

This PR adds HA queue awareness as well as sets loggins. 
Additionally the Fixes from @jrcloud were included.