Added some comments, updated docs