Some tweaks

Tweaks