changed network.c network.h for kstr
fix mistakes
merge