More fixes, now just need to fix the client...