tweaks to round out the first version