added comments, fixed data