updated a few areas for better semantics and corrected a few miss typings