added some debugging info, fixed queue issues