bug 1112: layout and typo fixes