Fixed client -> server communication. Some more cleaning up.