Updated gamelayer
Updated server/client