Data corrected, other issues resolved