add notification
fix small issues