some refinements of part 1,2,4,7
Merge branch 'master' of https://github.com/allenfantasy/proposal