Fixed text and computation issues