all bugs removed, in io and calc_2s1p