definately an improvement, and overall looks pretty good.
Although the part with him needing a 'blade on him at all times' ought to go, along with the blurb with him dousing a blade with gasoline. with gasoline, it isn't the liquid that burns, its the vapours that burn, Gasoline is highly explosive and creates a large, invisible vapor cloud that can be easily ignited
So if Marty's trick there was tried for real, he'd probably get
seriously hurt and burned.
and I don't think his 'Katana' would even make it though the airport before he got on the helicoptor. plus, real Katana are very expensive, and don't think Marty's uncle would be able to buy it outright, and also where you have Feral labs attempting to get marty by posing as a university, most universities have rules against having 'weapons' in my personal experiance you couldn't have a knife/sword whatever with a blade longer than 4 inches in length.
So probably best to just drop the katana part out