Fix to wait for internal http server to complete transfer. Rework and simplify comman...