Making it prettier. And adding some error pcts