working comments, but still need to fix some more