fix up options and notifications some more