Improved server selection a bit, hope its better now
Updated TODO.md