Fixed comments and tags