Added task + fixed network timeout problems

Just small fixes and stuff