Made some tweaks and polish changes.