fix double quotes
merge changes
fix array index bug