Removed some bugs from the swamp