finalizing code, plus new better data