Work in progress on importing Wave 2.
Finish adding data for wave 2 and op4.
Fix sorting error for firing arc.
More data fixes.