Fixes but 960409 and adresses review comments including removal of do-while construct