Add export. Fix comment bug