more tweaks and part reductions to the sandbox