Updated several pices of the puzzle.