Fix typos and update comments