working in constructor branch

adding comments, cleaning