a few initial tweaks
a few initial tweaks