Updated core
Updated docs