more work on notification system, fix a couple of minor issues from smarty conversion