Reviewed fixed. Added some more.