further improvements and refactorization of the engine