Added star, fixed unit conversion