fixing some typos, improving layout