Worked in the review-remarks, added proper coypright notices where missing