merged in and fixed some minor issues
now plotting real data