Add metrics
Fix somethings
Change tests
Replace StringP and CommentP