Final engine and fixes