fix next_start_date bug, add CS for map image swapping
moved test to unused