Fixed bugs with the computation engine, everything seems to work