some little enhancements