engine fixed after some mistakes and flaws