Fixed bugs so all three clients work now