A lot of tweaks to inconsistent Client/Server Model -.-