Fixed #379 and some typos.