A few end of line spaces in these changes, not very important, but beware :)