updated clientmap: new features & cleanup