added
improved syntax highlight, more robust q