Calculate a few things better