Added full listings and fixed NaN errors in averaging process