clarifications and tweakage