Fixed timeout and typos