Minor tweaks
Finalized