Fixed markup and added information