Language tweak, bug fixes, UI changes