Tortoise: comments, minor cleanup