extend manual clustering, some fixes, add ccc, add ccc-prop outcommented, add feature table