updated some build stuff
merged