lot of updates to core