Build scripts edited to be more automagical