fixes bugs and brings the core engine