Fixed toasts & distance + cleaning