Cleaned up some unused params and added notifications on some manually
selected items.