More tweaks to the server and todos added