Better names and comments
Add qualifiers to FKinds