Minor fixes, client now very basically works