4th Commit

Stability fixes