Dev. checkpoint: Touchups.