added more doc, removed redundancies