Adjust commented-out stuff some more
Add entrance/exit stuff for DNM too