added and removed a few comments