Comment list
typos and stuff.
code simplification.