Build improvements; adds version