clean up skel
fix up _skel (again)
struggle with git (again)