more fixes... toasts are not showing for some reason though?