fixed f primitive normalization

added f contractions too