[v5r1p2] - fixes and improvement