Add some more comments, add freezetag