Corrected old variable names; improved output pairing for coordinates