Added comments, modified doc