Added map-cursor, fixed cursor-collect.