Reduce some noice and fix some typos