improvements comments and tags