refactor things, added two more genres