made a few enhancements