Fixed multiple network issues; Tank cleanup