- minor changes
- added some toasts