add genre filtering, clean up a little