fixing minor enhancements