Some more tweaks and small additions.