More consistent keyboard navigation
Appease JSLint
Fix basic editing