Revise copyright and TODOs