Tweaks and fixes.
Removing BasicComponents.
Prepping for HEE update.