Commented self presence handling #151