stability improvements + LBP added