fix hanging server calls and excessive console.logging