added Notifications
improved language handling