finally got indices right

still need to review sum over q and add other coordinates