updated compute_features.* plus miscellaneous changes