Added some doc strings
Fixing minor issues