added quotes & bug fixes
merged conflicts