parameter tweaks
some shifting of structure i think