bug fixes and network test