Re-commented some things