Added content

Cleaned up some of the old data structures.  Added content for all
arenas and waves.