Final (for real)

Just a few tweaks!