better notifications closes #267 and also #264