some fixes p2