Fixed generator, added score frames