quick fixes and toast messages
Merge pull request #15 from s3rcan/quick-fixes

quick fixes and toast messages