Fix health display
Some queueing and command fixes