Implement timeout case on API request & minor fixes.