new type of swirl map and other minor changes