fixing commas, single quotes; working on .ico support