added a few comments, removed less useful components