Fixed comments and visibility