add dev:fake
add comments
fix the fixed id issue
Merge branch 't7'