Core updates

update to internals, not related to certain implementations