add feature, add correct issues