Added window for server, fixed typos, removed dead code, added some todos