Added quotes and some minor fixes.