Bugs fixed, settings extended of notification