Some more tweaks and changes.