toString method added + minor details