Calc more features, fix pandas concatenation