typos
removed: old commented codes
add: missing comments