Stability improved and fixes