a few fixes and customizations