Update core
Misc work