Made entropy less jerky, cleaned out some dead commented code