Todos cleaned up.
Fixed file headers with proper copyright text.