Dev. checkpoint: Touchups.
Changed: much stricter