a few more tweaks, including connect.query