Add timer to send info request + some small fixes