longer timeout, updated type parsing