Several improvements for stability and result looping