adding types, fixing nf