another bugfix
squash more bugs, client server working much better