updated a few mistakes in 271447