merged order_a_reshap + small fixes