delete color for now, fix minor logic error