added defaults to remove others from spotlight and did some cleanup