Stabilty and comments updates