Laguage cleanup.
More work on rating