#42, style changes, dq to sq were parsing unneeded, more comments