Fix space suffix
Bunch of changes that had to be commited already