Finished up commenting and last minute clean up.