Fixed views, docstrings and comments