Only use 90 from each genre
various fixes