Docsting/comments fixes