Renames _sherlog in Sherlog, plus other minor fixes