add some build improvements