fix plurality and stuff