fixing commas and stuff