Sync with main project and some typos