Stability, fixes and improvements