Fix a typo and improve a couple things