Reduce warnings and code cleanup

Probably fixed a bug when selecting CTF maps as well.

Warnings down to 15