Fixed some bugs with teh starmap