Adding some of the little touches from paul irish.