clean up in code some additions to coments preparation comit for tag 1.1