cleaned up some config and notification stuff