tried to remove quotes, except where apparently necessary due to special characters; work on #33