Copyright and comment fixes

Authors: @akshoop