Correcting forking madness, commenting, etc.