Fixed comments and text