Updated net.cpp and some