Typo fix, improvements