committing various tweaks required for the recent experiments
tweaks for the latest experiments
@unused annotation