Changes to comments section, still needs work