better template
fix bootstrapping from a different branch than master