Improve controller permissions
Improve notifications
various fixes