Group planning. Group orders. Various fixes