Added some comments

Also removed some old code not used.