Updated comments view, minor changes and other stuff.