Fixes and missing spaces