Update comments, docs