small cleanups
escape tracking