Final touches

Tweaks + added hints.