Fixed more bugs. Changed genreName to name so it's consistent.