many nice enhancements