fix #183 #76 todo comments.
fix #184 and delete many comments.