small changes, hopefully right line-ending (changed manually).