Cleaned some stuff up
Changed tree to find PwEntry