bug fixes for crash and slow network operations