major fixing of features.v1