Factored out starter kit + other improvements