Change client side

-- Client side doesn't use id anymore, use (x,y)
-- Misc bug fixes