add cyclemap, fix messages