EAGLESIX-3157: replaced setImmediate with setTimeout for browser support.  other minor changes