Updating readme and some cfc clean up.
more fixes