Added comments, added package info