migrate to Milla and update
stash
fix some typos