So I retconned it. It should be in better order now. no confusing plot points or anything of the such.