warnings fixed
warnings fixed
Stability improvements - thanks to Reorder