adding marker expiration, more bugs