Always skip missing values
Get groupwise working again
Consistent naming scheme