Core updates and major changes

Commenting changes