Added notes, made query (hopefully) operational