update framework and little fix