Started fixing some comma problems