Accessability

fixed #398 
fixed #401 
fixed #400