fix some issues and typos