Fixed a typo and more