fixes and spaces