Genre fixed along with other fixes