Added some comments, changed clustering implementation back to original description in paper