+ various tweaks and enhancements