Basic functional/cosmetic changes and temp fixed the client side disconnect bug