added spoiler warning; changed naming scheme