Tweaks and cleaner extraction.
Re-imported content.