- Fixes following AO server merges
- Updated serverlist for AOC
- Some minor bugfixes