two non-functional changes -- removing trailing whitespaces, some spell fixes etc