Add summary, some fix