conversion stuff added
changed some timeouts