fixed a few things with range toaster
merged changes