update (compiling ok)

Now the core should compile.