still network related bugs. just polished some stuff