initialize from upstream repo
minor adjustments