minor starmap improvements