character and layout fixes