Added some comments, revised package