More additions to preferences and broadcast receiver.