made network queued, refactoring, other changes