magit, and other stuff