feature_map and notebook updates