formatting fixes, missing NanScopes, persis*.clear