little fixes and enhancements;