Added some comments & fixed few bugs in interface