Add comments and new package