more bug fixes with notification system.