added missing queries, need to clean up and add notes