Added more error checks
Changed to lower seconds till disappears
[BUGFIX] Updating correct peer