add style and build tweaks