little enhancements and fixes