small cleanups
some bank edit robustness