build tweaks
further tweaks