fixed pointers and redid q.h