Updates for integration

Some fixes and some addons