change trajectory colors, some clean up