fix/tweak/santization