fixed calculations, progress