added tricky cases
Improved parsing now handles ""