Added some comments, removed some old code.