Added a few comments/changes/functions