Tidied up console messages and fixed queue code.