Cortana integration, bug fixes

Cortana integration, bug fixes