tried to fix the swamp, but just cleaned up a bit