Notification
Code cleanup
Beter error handling