Various improvements/customizations.
commit