Fix the semantics. Tweaks.