Added Firestorm String,  some extra adjustments