Updated copyrights.
Updated todo.

thanks Bart for the gotchas.