Minor improvements, fixed some typos