tweaks to model handling. ported server model from vproxy