Added Most of general discussion
Changed table/Table figure/Figure. Updated todo.