Cleaned up Ray class a bit.
Updates to TODO file.