xml, logic updates, and dependency fix