Deleted commented out code.
Add basic accessibility support.