- made some design enhancements