Fix bug in Q/A loop, various updates