BUG: more fixes on groupby
BUG: fixed all groupbys!