Update/BugFix

Now working better with server/client side