general build improvments