core fixes and updates