Fixed some small bugs, improved toast messages