A lot of fixes. More stable engine