fixed calculations, updated specs