some fixes including  adding double quotes