#98 - accessibility enhancements