Bug fixes

Service notification and keeping track of the user's data preference