Bug fixes, extra notifications and restrict to a single instance