better layout and some typo fixes