Comments updated to reflect coming changes; consolidated wonders into one file.