added server side hold and other fixes