major bootstrap enhancements