fixed map-collect slide and reworking enum