Some optimisations and parameter tweaks.