Added toString method
Added some comments, todos