More updates and typos...