More adjusting notifications and making functions more common