the flames on the sword are stupid cuz they are "on" the render... u can't do anything with it cuz if u do u ruin the whole render... it looks a bit: fake...
To add a border, make a new layer over all the others, then select all (Ctrl+A), then go to Edit > Stroke, then best to choose no more than 2 pixels, with location: inside.