TImeout handling improved. Still a little bit of work to do