updates for new gen & k-maj fix