connection stuff & notifications: small fixes & cleanup