zscan - various updates